auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 24 Dec 2012 12:20:56 +0000 (13:20 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 24 Dec 2012 12:20:56 +0000 (13:20 +0100)

Trivial merge